Fix conversion specification (valgrind).

diff --git a/gpsbabel/html.c b/gpsbabel/html.c
index b1021844fa827dd3c4ab2af483c5a952564a15d6..dd725ffac000c7f7f7dad5d2be4c27a277020c0c 100644 (file)
--- a/gpsbabel/html.c
+++ b/gpsbabel/html.c
@@ -66,7 +66,7 @@ html_disp(const waypoint *wpt)
        int latint, lonint;
        char tbuf[1024];
        time_t tm = wpt->creation_time;
-       int32 utmz;
+       gbint32 utmz;
        double utme, utmn;
        char utmzc;
        fs_xml *fs_gpx = NULL;
@@ -83,7 +83,7 @@ html_disp(const waypoint *wpt)
 
        fprintf(file_out, "<hr>\n");
        fprintf(file_out, "<a name=\"%s\"></a><table width=\"100%%\"><tr><td>\n", wpt->shortname);
-       fprintf(file_out, "<h3 class=\"waypoint\">%s - %c%d&deg;%06.3f %c%d&deg;%06.3f (%ld%c %6.0f %7.0f)",
+       fprintf(file_out, "<h3 class=\"waypoint\">%s - %c%d&deg;%06.3f %c%d&deg;%06.3f (%d%c %6.0f %7.0f)",
                (global_opts.synthesize_shortnames) ? mkshort_from_wpt(mkshort_handle, wpt) : wpt->shortname,
                wpt->latitude < 0 ? 'S' : 'N',  latint, 60.0 * (fabs(wpt->latitude) - latint), 
                wpt->longitude < 0 ? 'W' : 'E', lonint, 60.0 * (fabs(wpt->longitude) - lonint),

diff --git a/gpsbabel/text.c b/gpsbabel/text.c
index 70297d51437ee76409889647af5a4f72f1591c52..d1a405e2a1d0bcc3a9297787be1530c4b82ece7a 100644 (file)
--- a/gpsbabel/text.c
+++ b/gpsbabel/text.c
@@ -67,7 +67,7 @@ text_disp(const waypoint *wpt)
        int latint, lonint;
        char tbuf[1024];
        time_t tm = wpt->creation_time;
-       int32 utmz;
+       gbint32 utmz;
        double utme, utmn;
        char utmzc;
        fs_xml *fs_gpx;
@@ -82,7 +82,7 @@ text_disp(const waypoint *wpt)
                tm = time(NULL);
        strftime(tbuf, sizeof(tbuf), "%d-%b-%Y", localtime(&tm));
 
-       fprintf(file_out, "%-16s  %c%d %06.3f  %c%d %06.3f  (%ld%c %6.0f %7.0f)",
+       fprintf(file_out, "%-16s  %c%d %06.3f  %c%d %06.3f  (%d%c %6.0f %7.0f)",
                (global_opts.synthesize_shortnames) ? mkshort_from_wpt(mkshort_handle, wpt) : wpt->shortname,
                wpt->latitude < 0 ? 'S' : 'N',  abs(latint), 60.0 * (fabs(wpt->latitude) - latint), 
                wpt->longitude < 0 ? 'W' : 'E', abs(lonint), 60.0 * (fabs(wpt->longitude) - lonint),